merge updated lighttable vim mode version