reverting mixed changes from another branch for prev commit