code clean up
confilect fix