It's tough. I have had that happen before but I tend to think it's better to leave things as they are unless you plan on making major changes or if other people are working on the project. It reminds me of the time when I was working on a project and how horrible it was to merge branches together with other people's code.