Branch 3 edit 7 for conflict