task 2
fix merging