Working on merges
finished merge logic