merge erros corrected