My branch is getting more and more different from master