commit to conflict