lock update
lock update - merge