Deleting file created due to conflicts.