updating Gemfiles manually to testmycodes, due conflichts
merging