cleaning up the merge #94

Closed pstephen43 closed 10 years ago