Merge with main - auto-resolved

.gitattributes

@@ -73,6 +73,7 @@ NGC1300/hlsp_phangs-jwst_jwst_nircam_ngc1300_f300m_v1p0p1_img.fits filter=lfs di
 NGC1300/hlsp_phangs-jwst_jwst_nircam_ngc1300_f335m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1300/hlsp_phangs-jwst_jwst_nircam_ngc1300_f360m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1300/NGC1300-0.89asec_MAPS.fits filter=lfs diff=lfs merge=lfs -text
+NGC1300/NGC1300-150pc_MAPS.fits filter=lfs diff=lfs merge=lfs -text
 NGC1365/hlsp_phangs-jwst_jwst_miri_ngc1365_f1000w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1365/hlsp_phangs-jwst_jwst_miri_ngc1365_f1130w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1365/hlsp_phangs-jwst_jwst_miri_ngc1365_f2100w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
@@ -82,6 +83,7 @@ NGC1365/hlsp_phangs-jwst_jwst_nircam_ngc1365_f300m_v1p0p1_img.fits filter=lfs di
 NGC1365/hlsp_phangs-jwst_jwst_nircam_ngc1365_f335m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1365/hlsp_phangs-jwst_jwst_nircam_ngc1365_f360m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1365/NGC1365-1.15asec_MAPS.fits filter=lfs diff=lfs merge=lfs -text
+NGC1365/NGC1365-150pc_MAPS.fits filter=lfs diff=lfs merge=lfs -text
 NGC1385/hlsp_phangs-jwst_jwst_miri_ngc1385_f1000w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1385/hlsp_phangs-jwst_jwst_miri_ngc1385_f1130w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1385/hlsp_phangs-jwst_jwst_miri_ngc1385_f2100w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
@@ -91,6 +93,7 @@ NGC1385/hlsp_phangs-jwst_jwst_nircam_ngc1385_f300m_v1p0p1_img.fits filter=lfs di
 NGC1385/hlsp_phangs-jwst_jwst_nircam_ngc1385_f335m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1385/hlsp_phangs-jwst_jwst_nircam_ngc1385_f360m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1385/NGC1385-0.77asec_MAPS.fits filter=lfs diff=lfs merge=lfs -text
+NGC1385/NGC1385-150pc_MAPS.fits filter=lfs diff=lfs merge=lfs -text
 NGC1433/hlsp_phangs-jwst_jwst_miri_ngc1433_f1000w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1433/hlsp_phangs-jwst_jwst_miri_ngc1433_f1130w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1433/hlsp_phangs-jwst_jwst_miri_ngc1433_f2100w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
@@ -100,6 +103,7 @@ NGC1433/hlsp_phangs-jwst_jwst_nircam_ngc1433_f300m_v1p0p1_img.fits filter=lfs di
 NGC1433/hlsp_phangs-jwst_jwst_nircam_ngc1433_f335m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1433/hlsp_phangs-jwst_jwst_nircam_ngc1433_f360m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1433/NGC1433-0.91asec_MAPS.fits filter=lfs diff=lfs merge=lfs -text
+NGC1433/NGC1433-150pc_MAPS.fits filter=lfs diff=lfs merge=lfs -text
 NGC1512/hlsp_phangs-jwst_jwst_miri_ngc1512_f1000w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1512/hlsp_phangs-jwst_jwst_miri_ngc1512_f1130w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1512/hlsp_phangs-jwst_jwst_miri_ngc1512_f2100w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
@@ -109,6 +113,7 @@ NGC1512/hlsp_phangs-jwst_jwst_nircam_ngc1512_f300m_v1p0p1_img.fits filter=lfs di
 NGC1512/hlsp_phangs-jwst_jwst_nircam_ngc1512_f335m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1512/hlsp_phangs-jwst_jwst_nircam_ngc1512_f360m_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1512/NGC1512-1.25asec_MAPS.fits filter=lfs diff=lfs merge=lfs -text
+NGC1512/NGC1512-150pc_MAPS.fits filter=lfs diff=lfs merge=lfs -text
 NGC1566/hlsp_phangs-jwst_jwst_miri_ngc1566_f1000w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1566/hlsp_phangs-jwst_jwst_miri_ngc1566_f1130w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text
 NGC1566/hlsp_phangs-jwst_jwst_miri_ngc1566_f2100w_v1p0p1_img.fits filter=lfs diff=lfs merge=lfs -text

resolve.sh

@@ -109,5 +109,5 @@ echo "============================================"
 
 # Return to main branch
 git checkout main 2>/dev/null || git checkout master 2>/dev/null
-
+git pull
 echo "Done! Returned to main branch."