Deleted files form merge confilct.