Resolve problem & Conflicts