yaml error from fixing merge