Rolled back and pulled out files and manually added