resolved conflict in brick_point_in_direction.xml