updated gitignore to remove unneeded styling stuff
fixed another merge conflict