fixed a mergefail