Only 3 shift/reduce conflictsgit add ../README.md ! :)