Conflict squashing