finish resolving conflicts