Fix conflict that had been pushed