merging forked branch to my branch