Added the first attempt of a merge file