Merger attempted

Still has bugs