fixed gem conflic files