init the gem repository
fix merge conflict