update configs and fix conflicts
Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.xyz>
Andrei Jiroh Halili 2 years ago dd8ad5f5 d720f88a