Fixed issue #4345.

Removed confilict markers v0.13.0.txt.