resized pickle
resolved merge conflict application.html.erb