still chasing merge errors