Adding conflicts
"something"

Merge branch 'master' of https://github.com/pravs91/cs752_benchmarks