third commit - conflict attempt
third commit with effective merge