commit message
resolve merge conflict