merge initial q to master