Manually merging conflicts after pulling from upstream