resolve merge confilict