actually resolving the merge conflict this time :/