Dependency problem after merge with github