Updated Gem-file
Finish basic step
Conflict