Reverted to message with file condition

This way the user gets that little bit of extra info that it has been
merged in