trying to get merge fixed...not done yet