fuck this shit
resolving of conflict