Removed some errors
merge