test shot
resolved conflict