deleted .orig
merge soutchay
fixed background