After resolving conflicts from the second