oDesk to merge with Elance