Now merges always inserted methods
Fixed method destination decision for Super
Fixed Lombok issues