Fixed merging issues
Switch to simplex style