terrance please
conflict resolved (merging)