fix conflict between version3 and version4 branch and working directory