Merging and promoting changes from edge branch