merge with master/resolve conflicts