Resolve Draggable merge conflicts