i had removed this and put into site.js I think your conflict resolution got rid off this change.