fix Image import error
fix conflic
fix Find my pet link wording