Fix build
Fix conflicts