Update 259b4452.md
Resolved conflict.