added ntp line
resolved stupid conflict