Added fight on output
Fixed conflict