Corrected GemFile and GemFile.lock conflict