removed conflicts from conf files