fixed git merge failure