mergin some errors
fix