Add shell integration feature that moves prompt to leftmost column
Resolve merge conflicts