Added generics example
Merging...
Solving conflicts
Synching after merge