git squash without repetitive conflicts