trying to figure what is going on with this merge thing