resolve merge stuff