first commit
fetch
removed merged conflicts