merge conflict resolution - WKB