After resolving conflicts ...