version conflict mystery - resolved