Fixed the weird slide positioning for the guide
Fix mermge conflicts