Fixing conflict

Don’t know how the conflict message got back in there.