fix a merge problem 

2 merged was in prev doc.