viewing changes
all
deleted files
fixed conflict