merge with master by-hand