FIXED input problem
Fixing merge conflict