There's way too many changes in this file. please reduce the diff to the code differences.