crdlc merge master fix