removed garbage line from conflict