comming logs to try and fix gitignore
merging