final for part 2
fixed conflict