Improve documentation

examples/window_icon.rs

@@ -8,14 +8,10 @@ extern crate image;
 
 #[cfg(feature = "icon_loading")]
 fn main() {
-<<<<<<< HEAD
-    use winit::Icon;
-=======
     use winit::window::{WindowBuilder, Icon};
     use winit::event::Event;
     use winit::event_loop::{EventLoop, ControlFlow};
 
->>>>>>> Re-organize into module structure
     // You'll have to choose an icon size at your own discretion. On X11, the desired size varies
     // by WM, and on Windows, you still have to account for screen scaling. Here we use 32px,
     // since it seems to work well enough in most cases. Be careful about going too high, or