fixed a merge issue and a failed unit