Merge conflict resolve

Remove merge conflicts to go into master.