* resolve merge conflict