The 3 merged files had no conflicts and were manually verified to ensure no incompatible changes crept in.