Master copy working after Merge