Fixed diff/merge typos
Added arrows