Removed conflict markers
Applied r168173 from svn to fix dependency from target to codegen lib