Fixed file remove problem.
Fixed merge conflict.