integrate brick
fix conflicts