Initialize gem files
Fixed merge conflicts