Fix typos
resolve merge conflict