Yes! Your modified version would stay the same, if I have an update which conflicts with your modified version you can simply select what to add to your modified version and then modify would take care of the rest.