Barricade situation ends in Makaha