I think you are fine since it still merges cleanly. Just squash and we can merge.