re-uncommented the files post-merge