basic components persistance ok
fix conflict