fix mergefail