* resolve merge conflicts