Also, the conflict resolution library (https://github.com/codeparty/racer) that is used looks to be very cool.