merge with master and use warning