fixed up problem with merge