merge script: try to fix LOCK