changes on dev
merge conflicts resolved