add brush/color
 fixed conflict