resetted the code after the merge issue