Remove annoyance
Resolve conflict