added debug files to the git ignore file
fixed some merge conflicts