That makes me think that applying a machine learning algorithm to suggest conflict merge fixes would be a fun little project.