adds logs in the gitignore file list
fixes conflicts
Merge remote-tracking branch 'origin/pgbuilder' into pgbuilder