It ends a four-month public standoff between the two companies and marks another milestone acquisition in the building ...