Merge conflict · Git · Vibe to Dev