Fixed errors
Merge