some changes
resolving conflict
contact form conflict resolved