new file conflict
added hijacked version
cleared back down