Fixed merge issues and fixed extraneous issues.