fixed git merge issues in code