resolved conflict in timber-image.php
resolved conflict in timber-image.php

mgmartel/timber,Jmayhak/timber,ogrosko/timber,gchtr/timber,gbarberi/timber,aaemnnosttv/timber,rpkoller/timber,xavierpriour/timber,xavivars/timber,jnweaver/timber,aprendiendoando/timber,ogrosko/timber,PrisisForks/timber,pensesmart/timber,blocher/timber,jnweaver/timber,Jmayhak/timber,anugupta/timber,jarednova/timber,joelgarciajr84/timber,blocher/timber,pensesmart/timber,pensesmart/timber,mgmartel/timber,Jmayhak/timber,joelgarciajr84/timber,timber/timber,xavierpriour/timber,jarednova/timber,aprendiendoando/timber,PrisisForks/timber,gchtr/timber,jarednova/timber,josephbergdoll/timber,aaemnnosttv/timber,xavivars/timber,lucasmichot/timber,jnweaver/timber,PrisisForks/timber,gchtr/timber,aaemnnosttv/timber,anugupta/timber,timber/timber,anugupta/timber,joelgarciajr84/timber,mojaray2k/timber,mgmartel/timber,blocher/timber,lucasmichot/timber,lucasmichot/timber,ogrosko/timber,josephbergdoll/timber,gbarberi/timber,gbarberi/timber,xavierpriour/timber,mojaray2k/timber,mojaray2k/timber,aprendiendoando/timber,xavivars/timber,rpkoller/timber,josephbergdoll/timber,rpkoller/timber