If file is added from both sides it's also a conflict