fixed img
resolved conflict