Resetting files to status before merge conflict