Merging changes with actual branch