problems with merging branch - last files