The whole point of a VCS is that your code exists in a superposition of merged and unmerged.