Final Merge Fix...or is it?