merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED

ACTION_KEEP_NEW and ACTION_CHANGED_DELETED are conflicting actions as one says
that file is new while other says that file was present earlier and has
changed-delete conflicts.

Let's do changed-delete which will lead to conflicts and make user choose the
right way.
11 jobs for topic/default/merge-newnode-final in 45 minutes and 10 seconds (queued for 7 minutes and 57 seconds)