Meeting with @carmen-ooo: resolving git merge conflicts; gtm tasks workflow