Cleaned up merge problem