merge Force lock patch