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

This reverts commit 7aa86a93582cd20ac4b219f03cf9f1c1a15470a1.