Merge with parent branch