added manual input
Merge origin/master