changes
resolves conflicts