Cleaned the merge.