merge conflict in assignment8 gefixt