^#%$! Git does not have an interactive merge. It just dumps the changes in the file meaning I cannot open them with leo