merging branch for release