Fix merge to master