cleaned up merge conflicts

buff said