Fixed merge stuff. Learn to merge.