fixed a merge conflict with our link