Attempting to clean up merge