Fixing merge error and removing unnecessary file.