Flat merge or original proof of concept