Git merges can be better
brandondong.github.io