Fixed conflict that I thought was resolved