fixed git merge again