Merge now has better depth-positioning, although there are still some
issues. Tiles that are removed as inconsistent between branches using
merge are now a brighter orange.