Remove diff markers (caused by previous commit mistake)