Fixed health conflicts