removed merge conflcts from Kodekracker