fixing errors after git merge