making-merge-upstream-easier