task bar edit
solved merged confilicts