final update to remove merge errors