Cleaned up merge conflicts