change application title
fix merge conflicts