project file changes in IAR
ignore random files
.
resolving conflict