cleaned up merge conflicts

my bad