hello

got rid of merge mess