added main gem files
changed for new gem files
fix conflict