dealing with merge errors
Reslidified the file