@daniel daniel / resolve_conflicts.py
Created at Thu Jul 22 18:46:37 CEST 2021