Add ignoreconflicts to wbmergeitems api module

Change-Id: I03684ea387e818641d26cda9f1613822bc5e2534
Merge "Add ignoreconflicts to wbmergeitems api module"