preMerge with master version