merge 1 linux
resolve conflict merge1