wbmergeitems can now ignore sitelink conflicts

Change-Id: I65d63774aa916fe4935945258a2873ca423dfee2
Merge "wbmergeitems can now ignore sitelink conflicts"