Fix a few mismerge and style issues