Fixed code ruined when I merged the repo with local changes