Fixed conflicting changes delimiter to fit on one line on iPhone 5
Fixed bug with same content being on both sides ofconflict