Clean up require and remove merge error.