Ooops
Added a third file
Temporary commit before switching branches
conflict
Another conflict
Resolved conflict