update gitignore to clean strutter of project
add folder merges in gitignore