removed the conflictive file