finish resolving conflict