Added merge and checkout master aliases