fixing you lose bug
fixed conflict