Revert "resolving conflicts in input"
"undoing unintended push"

This reverts commit 93f9f47d1a0dc1aa90451378e498c2481ca7e81a, reversing
changes made to 5934bdbf1c4f79210234480bf8d58ce4c5cb73f4.

:wq