Corrected bug
Conflict solved