Ignore result Files
Merge conflic resolveD