commit 3 - conflict!