Added conflictnotifications based on separate files (expand to see which branches file was changed in).