merge was broken