mines better
fixed merge conflict