First commit to conflict