merge conflict removed in kodekracker-repo