branch dev
and nice
& nice
confilict fixed