pulled and migrated
added image on info window
removed conflicts