remove conflict indicator
Update translation file
Fix css bug
Merge pull request #3 from xarsh/master

fix css bugs