fixed img scaling on hover
fixed conflict