commit to work together
merge conflict solved