adding fixtures test
fixing conflict