removed return true and changed to_a.map to .map
fixed merge conflicts and added red to error

* fixed merge conflicts from master
* added red color to merge conflict error
* changed version to 2.5.0.beta3