Add comments & merge