conflict settled by adding them together