crud more merge conflicts in main lib