changed size
fixed merge conflict