last one
some changes
merge + git ignore clear