Fighting between army and rebels kills 24 in Yemen