Check for conflict only if annotation is present

Example also added