Merge geometry bugfix