add gem_extensions
resolve merge conflicts
fix merge conflict bis
fix merge conflict ter