merged Windows and Linux configs