Fix droneModel.js file being overwritten by merge