Fix Altmerge