Fix conflicts in main