Added trait conflict resolution
Fixed traits unit test