update at client
merger by remove confict info