Resolved further conflicts in Preprocessor