Bug fixes
Fix conflict