New dog attacking other dog

Question
I just adopted a 2 year old female german shepard mix from the shelter and I have a 2 year old female chipom.  I introduced them both on leashes and they seemed to do okay.  The chipom would growl at the shepard when she came near me but nothing else happened.  Then last night the chipom was walking behind the shepard and the shepard turned around and got the chipom pretty good.  I went over and said AHH AHH and the shepard stopped but the chipom was quite terrified.  I kept them apart last night and when they woke up this morning the chipom growled at the shepard but nothing else.  I was on the couch and the chipom was with me and behind me and the shepard was in front of me on the floor.  I was petting them both and telling the chipom it was okay.  I went to get up and the shepard went for the chipom and got her just a little bit.  As soon as I said AHH AHH the shepard did stop.  I am not sure what to do and now I have the chipom in her crate which she sees as punishment because my mother would put her in it for long periods of time when she was a puppy.  Please help me with acclamating them together!!

Answer
The best way to deal with this would be to muzzle both dogs,and let them sort out there order. As fighting will continue if it doesn't stop and will only get worse. This way they can sort it out without drawing blood. The best type of muzzles to use are basket muzzles. This is a common problem and this is also the best solution,I have done this with dozens of dogs