@ximenesuk I think a merge conflict marker hasn't been removed here...