Commit this change to conflict.txt
New file added
Merge pull request #6 from ryanwalker/fix/INF-12345-dashboard-fix

Fix/inf 12345 dashboard fix