Merge conflicts resolved again, now completely