masteriin metodi
merge master