resolved merge conflict and removed all gems