Final merging on conflict. Hope it is all fine