Merge conflicts fixed. I think.