updated ignore
updated simple stuff
Fix merge conflict