Fixing bugs with version conflicts