Various fixes to combat
Fixed conflict