All screens have been added
Conflicts resolved