Cleaned up express to remove the function argument. It's unnecessary.
Fixed conflicts.