dreiss/merge-examples

Example merge conflicts

Shell