Fix conflict between #master and /setmaster 1