Preparing master merge