Fixed the dissappearance of status after the merge