removed unused import <- merge error