working sort of
fix conflict