fixed issue on confliting code