d
conflict fixed
added git staff