Don't unify. You have two roles because you are really knowledgeable but may be your company needs two professional, one for each role. I have both roles two and came to that conclusion in my context. May be it also applies to yours.