conflict commit 2