removed unused method
fixing conflicts