linux
fix conflicts