GitTut: resolving conflicts