Assigned value of 31
Fixed conflicts