minor changes + gitignore
conflict fix
somethign else