Ignore backup files.
Fix conflict in credits