hw2
having issues with merging