changed padding
fixed merge conflict