Fixed yet another merge conflict