fixed the git merge issues
bin