Fixing conflicts etc.