Fixed wrong solution to conflict