final round of merge conflicts

..i hope ;)