fixed some conflicts on penalty and corner positions
fixed merge conflict