Files not pushed during a merge?