Cleaned up merge artifacts