adding without pull
adding merged file