Merging parent branch