Resolved merge conflict, added tab as Ultisnips trigger