put some plusses
fixed conflict