After resolving conflicts ..