This whole file is showing as changed, can you look into why? We can't merge things like this as ANY change being made on this file in 2.2 or 2.3 is going to show as a conflict, and all you really changed here was one line.