Updaing title
Resolve conflicts