Merged confilict files