Added conflicted console line from system
merged conflict