license test running
fixed merge errors