Fixed bug with same content being on both sides ofconflict