added birds sounds
resolve conflicts
add fight sound