I'm assuming the reason I'm still seeing all of this is a git merge issue?