updating uptime
fixing merge conflict