revert back changes (to resolve conflicts)