Conflict when importing  Device Handler

For some reason importing zwave-lock.groovy from your repository creates conflicts and does not import it. 

Is zwave-lock-schlage.groovy the right one for the Schlage Connect locks (BE469)? By looking the code, it seems both of them mention this lock.

But one script has over 2071 lines of code and the second one 1701. So, which device handler better works with Schlage Connect lock?