fix conflict and remove konphyg