merge calculator in dev