Fix after merge conflict (I fogot remove <<<<<<<HEAD)