conflict error on pr2492 might cause problems when merged resubmit new pr already paid on https://github.com/trustwallet/assets/pull/2492#issuecomment-650152737