resolve conflicts on merge with upstream master