Deleted conflicts file