merge los-romka