committing to merge dev3