Removed merge artifacts that were breaking build files