changed some configs
fixed conflists