Cleaned up merge garbage