Fixed merge problem.
Added 'reload' alias to reload configuration.