If you omit this change here, will the merge conflicts go away? Raymond is reviewing your other pull.