Fixing merge junk