It works, so far...
Merge conflicts resolved, Works so far