Camera movement branch merging with master