OpenTTD.andythenorth(nrt-block)$ git merge upstream/master 
warning: Cannot merge binary files: media/extra_grf/openttdgui.png (HEAD vs. upstream/master)
Auto-merging src/vehicle.cpp
Auto-merging src/tunnelbridge_cmd.cpp
CONFLICT (content): Merge conflict in src/tunnelbridge_cmd.cpp
Auto-merging src/tunnel_map.h
Auto-merging src/town_cmd.cpp
Auto-merging src/toolbar_gui.cpp
CONFLICT (content): Merge conflict in src/toolbar_gui.cpp
Auto-merging src/station_map.h
Auto-merging src/station_cmd.cpp
Auto-merging src/script/api/script_window.hpp
Auto-merging src/script/api/game/game_window.hpp.sq
Auto-merging src/saveload/saveload.cpp
CONFLICT (content): Merge conflict in src/saveload/saveload.cpp
Auto-merging src/saveload/company_sl.cpp
Auto-merging src/saveload/afterload.cpp
CONFLICT (content): Merge conflict in src/saveload/afterload.cpp
Auto-merging src/roadveh_cmd.cpp
Auto-merging src/road_map.h
CONFLICT (content): Merge conflict in src/road_map.h
Auto-merging src/road_cmd.cpp
Auto-merging src/rail_gui.cpp
Auto-merging src/rail_cmd.cpp
Auto-merging src/pathfinder/yapf/yapf_road.cpp
CONFLICT (content): Merge conflict in src/pathfinder/yapf/yapf_road.cpp
Auto-merging src/pathfinder/yapf/yapf_costrail.hpp
Auto-merging src/pathfinder/npf/npf.cpp
CONFLICT (content): Merge conflict in src/pathfinder/npf/npf.cpp
Auto-merging src/pathfinder/follow_track.hpp
Auto-merging src/openttd.cpp
Auto-merging src/newgrf.cpp
Auto-merging src/lang/welsh.txt
Auto-merging src/lang/vietnamese.txt
Auto-merging src/lang/unfinished/urdu.txt
Auto-merging src/lang/unfinished/persian.txt
Auto-merging src/lang/unfinished/macedonian.txt
Auto-merging src/lang/unfinished/frisian.txt
Auto-merging src/lang/ukrainian.txt
Auto-merging src/lang/turkish.txt
Auto-merging src/lang/traditional_chinese.txt
Auto-merging src/lang/thai.txt
Auto-merging src/lang/tamil.txt
Auto-merging src/lang/swedish.txt
Auto-merging src/lang/spanish_MX.txt
Auto-merging src/lang/spanish.txt
Auto-merging src/lang/slovenian.txt
Auto-merging src/lang/slovak.txt
Auto-merging src/lang/simplified_chinese.txt
Auto-merging src/lang/serbian.txt
Auto-merging src/lang/russian.txt
Auto-merging src/lang/romanian.txt
Auto-merging src/lang/portuguese.txt
Auto-merging src/lang/polish.txt
Auto-merging src/lang/norwegian_nynorsk.txt
Auto-merging src/lang/norwegian_bokmal.txt
Auto-merging src/lang/malay.txt
Auto-merging src/lang/luxembourgish.txt
Auto-merging src/lang/lithuanian.txt
Auto-merging src/lang/latvian.txt
Auto-merging src/lang/latin.txt
Auto-merging src/lang/korean.txt
Auto-merging src/lang/japanese.txt
Auto-merging src/lang/italian.txt
Auto-merging src/lang/irish.txt
Auto-merging src/lang/indonesian.txt
Auto-merging src/lang/icelandic.txt
Auto-merging src/lang/hungarian.txt
Auto-merging src/lang/hebrew.txt
Auto-merging src/lang/greek.txt
Auto-merging src/lang/german.txt
Auto-merging src/lang/galician.txt
Auto-merging src/lang/gaelic.txt
Auto-merging src/lang/french.txt
Auto-merging src/lang/finnish.txt
Auto-merging src/lang/faroese.txt
Auto-merging src/lang/estonian.txt
Auto-merging src/lang/esperanto.txt
Auto-merging src/lang/english_US.txt
Auto-merging src/lang/english_AU.txt
Auto-merging src/lang/english.txt
Auto-merging src/lang/dutch.txt
Auto-merging src/lang/danish.txt
Auto-merging src/lang/czech.txt
Auto-merging src/lang/croatian.txt
Auto-merging src/lang/catalan.txt
Auto-merging src/lang/bulgarian.txt
Auto-merging src/lang/brazilian_portuguese.txt
Auto-merging src/lang/belarusian.txt
Auto-merging src/lang/basque.txt
Auto-merging src/lang/arabic_egypt.txt
Auto-merging src/lang/afrikaans.txt
Auto-merging src/economy.cpp
Auto-merging src/company_base.h
Auto-merging src/bridge_map.h
CONFLICT (content): Merge conflict in src/bridge_map.h
Auto-merging src/bridge_gui.cpp
Auto-merging source.list
Auto-merging projects/openttd_vs90.vcproj
Auto-merging projects/openttd_vs80.vcproj
Auto-merging projects/openttd_vs140.vcxproj.filters
Auto-merging projects/openttd_vs140.vcxproj
Auto-merging projects/openttd_vs100.vcxproj.filters
Auto-merging projects/openttd_vs100.vcxproj
Auto-merging media/extra_grf/openttdgui.png
CONFLICT (content): Merge conflict in media/extra_grf/openttdgui.png
Auto-merging docs/landscape_grid.html
CONFLICT (content): Merge conflict in docs/landscape_grid.html
Auto-merging docs/landscape.html
CONFLICT (content): Merge conflict in docs/landscape.html
Automatic merge failed; fix conflicts and then commit the result.