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