Resolved assembly conflicts