Report question

Question: tell git to use ours merge strategy on specific files