fix merge error in rails sync