adding remote commit file
resolve commite file merge conflict