Merging all the changes into branch