using github sources not plain npm
resolving merge conflict