Refactor weird merge conflict fixes