cleaned up merge conflict