restored code removed by git merge