This file needs to be unchanged--there is a separate file to add new modules too. Bad merge I guess