Added tip class
Resolved conflicts