Removed some extra merge files
Creating current screen
Merged