Cleaned Up Merge.