fix conflicts
Fix Decisions