add resources
fix confilt