Try to convert to git protocol
Fix config merge