Update man page and fix conflicts