first release ready
resolve merge confict in gitignore