Conflicts resolved + some of Morten's comments