Cleaned up merge problems