revert: revert files with "C"onflicts