why do i get a merge conflict alwaysgit add .
:)
yo