se agrego git ignore
solved merged files