Deleted conflict stuff from merge.