removed conflicted line

The line was conflicted due to commit from two different pc.