merge complete

sorry - fast