Reomve conflict tags