resolve conflicts between meg_compatible and attention_eline branches