commit 3
clean b
fix conflict