merging feature branch