Merge "Do not use --merge in rebot command"