BLD : go back to master, fix merged