resolve conflict on merge with upstream master