Test branched
Test commit
Conflict
Another conflict
Another one
Cleaned up test files
Changed lightline to use right arrows