working on configurations (adioo)
working on html snippets (adioo)
resolved conflicts