manual test of merging dev changes to master