Merge conflicts hopefully resolved