add some conflict to test.cs with test.cs on Branch-02