Fixed a litle bug and fixed the merge fault