gitigonre + other initial changes
conflict merge