actually fixing merge conflict