remove console log
merged conflict