fixed mergefail