added fixtures
Merging