issue#195 - fixed conflict

issue#195 - fixed conflict