payment relavant done
payment relavent after conflicts solved