corrected default text, fixed more merge errors