Fixed conflicting issues of po files