merging initial changes and branch changes