Removed junk from merge.