Add version stuff, check for conflicts