just a test for merge conflict resolve