Despite the conflicts.

FireStats error : FireStats: Unknown commit strategy