omrails2 to see if i can merge branches