drush up
merge dev
merge comflict resolved