corrected default value for peak_number
resolved conflicts