Sync screen changes and my library changes
Fixed the conflicts