changed file desc of input module
resolved conflict