Second Merge Fix