tweak some whitespace
resolve merge conflict