Conflict resolve caused a small problem