Added comment explaining our merge though process