cleaned up merge conflicts