after resolving conflicts