release version 2.5.0
Fixed merge conflicts