Fixed errors
Resolved conflicts