resized answer box
conflicts resolved