mergefail resolved