i believe i can fly
solve merge problem