Fixing conflicts and Auto generating configs stuff