Talking to JR over git with commits
Fixed JR file conflict