yea i usually have to redo the merge because i turn merge on for rails and ledges before i do a whole lot of merging
but when turn mergeing off move something in the settings so it saves.