(function () {
    var game = new Phaser.Game(
        window.innerWidth, window.innerHeight, Phaser.AUTO, 'tankr',
        { preload: preload,
          create: create,
          update: update }
    );
    var map;
    var player;
    var cursors;

    function preload() {
        console.log('preload');
        // game.load.tilemap('tankr', 'assets/map/tanker-14x14.json', null,
        //                   Phaser.Tilemap.TILED_JSON);
        game.load.image('tankBlue', 'assets/img/Tanks/tankBlue.png');
        game.load.image('barrelBlue', 'assets/img/Tanks/barrelBlue.png');

        game.load.image('grass', 'assets/img/Environment/grass.png');
        game.load.image('sandbagBrown', 'assets/img/Obstacles/sandbagBrown.png');
    }

    function create() {
        console.log('create');
        game.world.setBounds(-1000, -1000, 2000, 2000);
        // game.physics.startSystem(Phaser.Physics.ARCADE);

        land = game.add.tileSprite(0, 0, 2000, 2000, 'grass');
        land.fixedToCamera = true;

        player = game.add.sprite(0, 0, 'tankBlue');
        // player.anchor.setTo(0.5, 0.5);
        game.physics.startSystem(Phaser.Physics.ARCADE);
        player = game.add.sprite(900, 500, 'tankBlue');
        player.anchor.setTo(1, 1);
        barrel = game.add.sprite(0, 0, 'barrelBlue');
        // barrel.anchor.setTo(0.3, 0.5);

        // game.physics.arcade.enable(player);
        game.physics.enable(player, Phaser.Physics.ARCADE);
        // player.body.drag.set(0.2);
        // player.body.maxVelocity.setTo(400, 400);
        // player.body.collideWorldBounds = true;
        game.camera.follow(player);
        // game.camera.focusOnXY(0, 0);
        sandbagBrown1 = game.add.sprite(200, 200, 'sandbagBrown');
        sandbagBrown2 = game.add.sprite(-200, -200, 'sandbagBrown');
        // map = game.add.tilemap('tankr');
        // map = this.game.add.tilemap('MyTilemap');
        // map.addTilesetImage('tiles', 'tiles');

        // layer = map.createLayer('MyTerrain');
        // layer.resizeWorld();
        // layer.wrap = true;

        // player.bringToTop();
        // barrel.bringToTop();
        cursors = game.input.keyboard.createCursorKeys();
    }

    function update() {
<<<<<<< HEAD
        var units = 50,
=======
        var units = 100,
>>>>>>> e1e62dcf15ff9be0bf5628c66d29c50616facae5
            angle = 3;

        if (cursors.left.isDown) {
            player.angle += -angle;
            player.animations.play('left');
        } else if (cursors.right.isDown) {
            player.angle += angle;
            player.animations.play('right');
        } else if (cursors.down.isDown) {
            game.physics.arcade.velocityFromAngle(
                player.angle + 90,
                units,
                player.body.velocity
            );
            player.animations.play('down');
        } else if (cursors.up.isDown) {
            game.physics.arcade.velocityFromAngle(
                player.angle + -90,
                units,
                player.body.velocity
            );
            player.animations.play('up');
        } else {
            player.animations.stop();
            player.frame = 4;
        }
        if (cursors.up.isDown && player.body.touching.down && hitPlatform)
        {
            player.body.velocity.y = -350;
        }
    }

    function render() {
        console.log('render');
    }

    PlayerTank = function (game) {
        this.game = game;
        this.tank = game.add.sprite(
            game.world.randomX, game.world.randomY,
            'tank', 'tankRed'
        );

        game.physics.enable(tank, Phaser.Physics.ARCADE);
        tank.angle = game.rnd.angle();
        game.physics.arcade.velocityFromRotation(
            this.tank.rotation,
            100,
            this.tank.body.velocity
        );
    };

}());

@@ -2224,126 +2224,32 @@
 ) %7B%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A        var units = 50,%0A=======%0A        var units = 100,%0A%3E%3E%3E%3E%3E%3E%3E e1e62dcf15ff9be0bf5628c66d29c50616facae5
+        var units = 100,
 %0A   

fix conflict