merge master code