Merge i update do mastera