Release: Remove left-over merge markers