Done some fixes about the merge Update #4