Take local-remote modification time into account when importing JSON.

When importing JSON which has no merge option available, we now take into consideration modification timestamp again.