pull & merge diff