Automatically handle rails schema.rb conflicts