Testing conflicts inside an array diff and fixing whitespace problems