remove file that's causing a conflict. need to restore on dev.