Reduce the diff between my branch and upstream master