Fixing the CNG package to reference specific Erlang version
Resolving merge conflicts