merging pulled version of dev