Merge or rebase should have done it, by this you are reverting some of the changes done in master. Please fix your commits to prevent this.