Version 1.5.0.1

* Fix merging issue