ERROR: chunk hello was added within this branch and subsequently edited. This is not yet supported: refusing to merge.