typo
separate further between merge-local and merge-remote