update gitignore
messages out
resolve conflicts