[CONTEXT LOGGER] FIXED MERGE BUG