Made it compile on linux
merged conflict