file deleted
git ignore updated
merge try 1
llj conflict solved