updated gitignore
styles
fixed merge conflicts