From gitit should give no conflicts