revert changes after merge