Finixhing merge