conflicts
Fix tests