From gitit should give no conflict