Correct conflict

Signed-off-by: Steve Finkelstein <sf@stevefink.net>