Remove Gemfile.lock from repository
Improved initialization and merge