ignoring .suo files
merging