Virgin mobile, fixed conflicts with changes on dev