.gitconfig
adding .gitigonre
merge fixed