bug fixed after the merge