Modify git ignore
Add left turn specification
resolve conflict