fixing git merge issues
parameters injection
update indexer script
update gitignore