fix lock merge conflict