fixed some merge conflicts

BROKEN