Also merge gitinore files