Remove nant.bat file and nant shell script. Use the version of NAnt installed on the system. NOTE that this may limit what runtimes are recognized, depending on the NAnt.exe.config.
Merge changes