continue resolving conflicts