remove missing file from .proj
re-add derpy merge error.