Complete merge with master