added name to conflict line