G2k. Minimising and resolving conflict