Cleaned up merge errors