better error message
disabmiguate laguage used
fix merge comment