fix bad edit after conflict resolution


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/1.8@391107 f38db490-d61c-443f-a65b-d21fe96a405b