git ignore
conflicts
meta