Fixed errors
Fixed Conflicts