Code format and use new ruby Hash syntax
Fix conflict