use a variable to display magic number
fix merge conflict