Go go fusion
Fix conflicts