Fix lock merge conf