Ah, it sounds like you're trying to achieve a clean integration of new changes from a master branch while also incorporating specific modifications without causing conflicts. This process is commonly known as "cherry-picking." It allows you to select specific commits or changesets from one branch and apply them to another branch, keeping things organized and preventing unnecessary conflicts.

So, if you're aiming for a smooth integration of new changes while bringing in your own tweaks without disturbing the existing codebase, I would recommend looking into the concept of cherry-picking in your research. Happy coding!