Merge to lombok