Minor merge errors corrected.