Resolve merge problems