add log in mcbsp
change .gitignore
fix conflicts