linux changes
solve conflicts