Adding bricks files
fixed conflicts