'(+)comfortspot'
fixed conflict