Edited in svn; expect conflict in git.