fixed merge conflicts, again