Resolve Conflict
eyrey