remove conflict leftovers