pre merge
fix conf
building out points