fix: removing merge conflict leftovers