fix evaluate activity last merge