Fixed merge conflicts mostly