To fix some issue that happen when trying to merge the branches