Revert changes to revision before invalid merge