adding my name to conflict line