git: commit with conflict used to take all CPU and RAM...