setting up test 2
setting up state for merge
merging changes