updated to dev, fixed merge conflict