disabled 3-way merges