top padding + integration
conflicts solved