Added to homepage
Fixed Merge Conflict