Fixing startTargets
Fixed conflicts