Fixed slide menu hang introduced by merge conflict