minor mergefail fix