Resolved conflicts
Fixed style