fixing errors
merging