Update a bit
Cleanup, add ignore
resolve conflict