More conflict fixes & config sync