fix conflicts merging in amplab amp-0.9-20130517 version