Cleaned up merge