Fixed some conflicts and merge changes by git