Revert "Fixed the resx merge problem. Still need to correct the entityframework conflict."

This reverts commit f387b7c088ceb6fc8fcd92a3d15f6cb4e3077581.