fixing bash wrapper
fixing genconfig
resolving merge