fixing box-sizing issue
fixing conflicts