commit 3 (+2 squashed commit)

Squashed commit:

[8e82874] commit2

[fe6de33] commit 1