line up update
deal with conflict