Changed div by 3 test
Fixed merge conflict