Add signature
conflict resolved