Removed a conflict from git that I failed to check for.
Removed a conflict from git that I failed to check for.

gchtr/timber,gchtr/timber,gchtr/timber,jarednova/timber,timber/timber,timber/timber,jarednova/timber,jarednova/timber