There seems to be a merging issue here. It's causing gjslint to fail and some unit tests to fail as well.