Some fixes
fixes
no_conflict