Bug fixing after test
Fixing conflict