W-changes
Merge conflict
Resolve merge conflict
Remove unwanted files