commit 6
conflict solved