removed a conflict i left in by accident

Signed-off-by: jsinclair <james@mytcg.net>