Cleaned up some local merge junk