Fix errors made by merge