updated gemfiles
resolved merge conflicts
Updated stashed conflicts
deleted erb files