reset file after resolving conclict