merge problems
Fixed merged file
finished merge