Removed conflict markers
Changed logo at main screen