Conflict solved
put bug fixed