ruby 2.1.2
conflict fix