final commit with locking