initial stack setup
remote init merge conflict