Always has been able to do so -- but the catch is that the merge algorithm is "last change wins" and it is done on a per-action basis. In other words, if you change the context on an action on your iPhone, and then change the title of the action on your Mac, when the two are synced, the only change that will remain is the change to the title.