Revert changes before merge