work in progress
Resolving conflicts I hate life