Created icon
Resolve conflicts