I have no idea what i'm doing
Merge conf