I don't understand git conflict detection, but if keeping them separate results in less conflicts, I would side with @ogrisel here.