Assertion for conflict test
Renaming project to grunt-merge
Tests passing