Added alias for char* in useful.h. Makes context a bit more clear
merge error
re-syncing local and remote repos