Re committing changes after merge errors

Commit fixes merge errors