Fixing conflict etc (2)