merger with master