Fix access to conflict action when resolution attribute is set

The `remoteAction` and `localAction` attributes are not part of the change itself but of the conflict.

Since the `change.action` was undefined because of this, the following switch statement just kept hanging as described in #504.