[JES] Think I fixed it this time. Still no idea how I got a merge conflict in...

[JES] Think I fixed it this time. Still no idea how I got a merge conflict in a file I didn't make any changes to...