remove a missed merge