Added comments about how to merge and resolve conflicts