Some updating.. Still problem with the collision and move of the
player..
Fix Conflict