Git conflicts testing