linux merge
conflict solved