added files in git
remove confilits