Updates
Fixed gitignore merge failure