fixing little errors after merge