Resolved gem conflicts

* Added explicit version file
* Resolved gem conflicts