greeting function
Resolve conflits