 
     @model = new Model()
 
-<<<<<<< HEAD
-    @model.initialize(constants.TEXTURE_SIZE_P, constants.VIEWPORT_WIDTH, constants.DISTANCE_3D, @controlMode).done (tracingState) =>
-=======
-    @model.initialize(constants.TEXTURE_SIZE_P, constants.PLANE_WIDTH, constants.DISTANCE_3D).done ([restrictions, settings]) =>
->>>>>>> ca2aaa77333ce8e01a21890b459efb2a30764ed6
+    @model.initialize(constants.TEXTURE_SIZE_P, constants.PLANE_WIDTH, constants.DISTANCE_3D, @controlMode).done (tracingState) =>
 
       # Do not continue, when there was an error and we got no settings from the server
       if tracingState.error

      event.preventDefault() if (event.which == 32 or event.which == 18 or 37 <= event.which <= 40) and !$(":focus").length
      return

<<<<<<< HEAD
    keyboardControls = {
      "q" : => @toggleFullScreen()
    }

        "t" : => 
          @view.toggleTheme()       
          @abstractTreeController.drawTree()

        "m" : => # toggle between plane tracing and arbitrary tracing

          if @mode == constants.MODE_PLANE_TRACING
            @setMode(constants.MODE_ARBITRARY)
          else if @mode == constants.MODE_ARBITRARY
            @setMode(constants.MODE_PLANE_TRACING)

      "super + s, ctrl + s" : (event) =>

        event.preventDefault()
        event.stopPropagation()
        @gui.saveNow()
      } )

    )

    new Input.KeyboardNoLoop( keyboardControls )

