Added buggy collision detection on bricks
fixed merge conflict