Changed mergeTest2 in dev branch