Improved git module a bit, now it reports if a conflict occurs