removed merge code artifacts