• 3233433 merged conflict from feat/new-file |\
  | * f912bca commit 2 on feat/new-file | * fca554b commit 1 on new-file
• | a7e32af commit 4
• | e74316d commit 3 |/
• 8ec67eb commit 2
• 6eaf214 commit 1