solve mergeconflict in readme and gitignore