looks like this is only a whitespace change -- you should revert it so that the diff is more minimal (and it does indeed conflict with current master)