first commit!
some git conflicts merged to first commit