Agatha commit 1

Try to resolve a conflict online