Fixed title entity errors
Resolved conflicts