Yes, but that's not hard. Make a patchfile of your work, then use the patchfile to undo you're code. Then apply Lakitu's and rezyn's patches, and then apply your own patch. If lakitu's and rezyn's patches don't work, then you've done something wrong, but if you're patch doesn't work, it probably just means you need to go over the part that didn't work by hand again, it should be fairly trivial.