looked at a commit in diffusion and things seemed fine. (couldn't quite get this to reproduce but I think this is the right fix..Looked at rXPRF0a7a5f69f5d7 in a local instance. To get this to reproduce you need to have a commit with some merge history.)things looked great both pre and post patch.